MSVC Introspection Builds: Remove GCC Requirement

Sorry, the last commit added a generated file instead of the
template.

G-I has been updated to not require a Windows GCC installation
anymore to generate the .gir files, so update the NMake Makefiles
that are used for this purpose.

As a result, it is no longer necessary to define time_t for the .gir
generation as we are on the same compiler throughout the process.

diff --git a/build/gtk-introspection-msvc.mak.in b/build/gtk-introspection-msvc.mak.in
index 97130232d3ebfdd56d580dd483d4a8685637fd28..ae5ea4319bff40089527c484cf7d8509c6981f10 100644 (file)
--- a/build/gtk-introspection-msvc.mak.in
+++ b/build/gtk-introspection-msvc.mak.in
@@ -9,12 +9,6 @@ CHECK_PACKAGE = gdk-pixbuf-2.0 atk pangocairo gio-2.0
 built_install_girs = Gdk-$(APIVERSION).gir GdkWin32-$(APIVERSION).gir Gtk-$(APIVERSION).gir
 built_install_typelibs = Gdk-$(APIVERSION).typelib GdkWin32-$(APIVERSION).typelib Gtk-$(APIVERSION).typelib
 
-!if "$(PLAT)" == "x64"
-TIME_T_DEFINE = -Dtime_t=long long
-!else
-TIME_T_DEFINE = -Dtime_t=long
-!endif
-
 !include introspection-msvc.mak
 
 !if "$(BUILD_INTROSPECTION)" == "TRUE"
@@ -27,7 +21,7 @@ gdk_list gdkwin32_list gtk_list:
 setgirbuildnev:
        @set CC=$(CC)
        @set PYTHONPATH=$(BASEDIR)\lib\gobject-introspection
-       @set PATH=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(BASEDIR)\bin;$(PATH);$(MINGWDIR)\bin
+       @set PATH=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(BASEDIR)\bin;$(PATH)
        @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
        @set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB)
 
@@ -37,7 +31,7 @@ Gdk-$(APIVERSION).gir: gdk_list
        -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include \
        -I$(BASEDIR)\include\pango-1.0 -I$(BASEDIR)\include\atk-1.0     \
        -I$(BASEDIR)\include\gdk-pixbuf-2.0 -I$(BASEDIR)\include        \
-       $(TIME_T_DEFINE) --namespace=Gdk --nsversion=3.0        \
+       --namespace=Gdk --nsversion=3.0 \
        --include=Gio-2.0 --include=GdkPixbuf-2.0       \
        --include=Pango-1.0 --include=cairo-1.0 \
        --no-libtool --library=gdk-3.0  \
@@ -52,7 +46,7 @@ GdkWin32-$(APIVERSION).gir: gdkwin32_list
        -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include \
        -I$(BASEDIR)\include\pango-1.0 -I$(BASEDIR)\include\atk-1.0     \
        -I$(BASEDIR)\include\gdk-pixbuf-2.0 -I$(BASEDIR)\include        \
-       $(TIME_T_DEFINE) --namespace=GdkWin32 --nsversion=3.0   \
+       --namespace=GdkWin32 --nsversion=3.0    \
        --include=Gio-2.0 --include=GdkPixbuf-2.0       \
        --include=Pango-1.0     --include-uninstalled=./Gdk-$(APIVERSION).gir   \
        --no-libtool --library=gdk-3.0  \
@@ -73,7 +67,7 @@ Gtk-$(APIVERSION).gir: gtk_list
        --reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=.   \
        --pkg-export gtk+-3.0 --warn-all --c-include="gtk/gtkx.h"       \
        -DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"/dummy/lib\"      \
-       $(TIME_T_DEFINE) -DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\"    \
+       -DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\"     \
        -DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"@GTK_VERSION@\" \
        -DGTK_BINARY_VERSION=\"3.0.0\" -DGTK_HOST=\"i686-pc-vs$(VSVER)\"        \
        -DGTK_COMPILATION -DGTK_PRINT_BACKENDS=\"file\" \

diff --git a/build/introspection-msvc.mak b/build/introspection-msvc.mak
index beff817d00df365d1ed8c5bb1ec78cd6316b9036..55eec4574d962a427a6d9bac126ca77f726f2cf6 100644 (file)
--- a/build/introspection-msvc.mak
+++ b/build/introspection-msvc.mak
@@ -26,7 +26,6 @@ VALID_PKG_CONFIG_PATH = FALSE
 VALID_GCC_INSTPATH = FALSE
 
 MSG_INVALID_PKGCONFIG = You must set or specifiy a valid PKG_CONFIG_PATH
-MSG_INVALID_MINGWDIR = You must set or specifiy a valid MINGWDIR, where gcc.exe can be found in %MINGWDIR%\bin
 MSG_INVALID_CFG = You need to specify or set CFG to be release or debug to use this Makefile to build the Introspection Files
 
 ERROR_MSG =
@@ -47,15 +46,7 @@ VALID_PKG_CONFIG_PATH = TRUE
 VALID_PKG_CONFIG_PATH = FALSE
 !endif
 
-!if ![IF EXIST %MINGWDIR%\bin\gcc.exe @echo VALID_GCC_INSTPATH=TRUE > gcccheck.x]
-!endif
-
-!if ![IF NOT EXIST %MINGWDIR%\bin\gcc.exe @echo VALID_GCC_INSTPATH=FALSE > gcccheck.x]
-!endif
-
-!include gcccheck.x
-
-!if ![del $(ERRNUL) /q/f pkgconfig.chksize gcccheck.x]
+!if ![del $(ERRNUL) /q/f pkgconfig.chksize]
 !endif
 
 VALID_CFGSET = FALSE
@@ -63,11 +54,6 @@ VALID_CFGSET = FALSE
 VALID_CFGSET = TRUE
 !endif
 
-!if "$(VALID_GCC_INSTPATH)" != "TRUE"
-BUILD_INTROSPECTION = FALSE
-ERROR_MSG = $(MSG_INVALID_MINGWDIR)
-!endif
-
 !if "$(VALID_PKG_CONFIG_PATH)" != "TRUE"
 BUILD_INTROSPECTION = FALSE
 ERROR_MSG = $(MSG_INVALID_PKGCONFIG)